Merge git://git.denx.de/u-boot-mpc85xx
authorTom Rini <[email protected]>
Sat, 15 Oct 2016 17:03:19 +0000 (13:03 -0400)
committerTom Rini <[email protected]>
Sat, 15 Oct 2016 17:03:19 +0000 (13:03 -0400)

Trivial merge